Updated to not throw when returning a single item (this can just return null...

Updated to not throw when returning a single item (this can just return null as frames did) and added a test