Object check - Fixes #537